merging branches using tortoiseGit

welcome to shbcf.ru